Merge version 2.4.5+dfsg1-1+rpi1 and 3.1.1+dfsg1-1 to produce 3.1.1+dfsg1-1+rpi1

diff --cc debian/changelog
index 1e6514b147d62d86ef369703358c2d7c545a2c39,3041b088f472947674ca6c38e19ca7e478e32224..6ba416e451a14bcda671d721fa3fc523aa90855d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,21 +1,32 @@@
- 389-ds-base (2.4.5+dfsg1-1+rpi1) trixie-staging; urgency=medium
++389-ds-base (3.1.1+dfsg1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
 +  [changes introduced in 2.4.5+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Add missing build-depends on librust-ahash-0.7-dev
 +  * Add missing build-depends on libnl-3-dev
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Jun 2024 16:07:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Oct 2024 12:53:11 +0000
++
+ 389-ds-base (3.1.1+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release. (Closes: #1073466)
+     - CVE-2024-6237
+     - CVE-2024-5953
+     - CVE-2024-3657
+     - CVE-2024-2199 (Closes: #1072531)
+   * control, vendor: Add librust-ahash-0.7-dev to build-depends, modify
+     concread cargo to allow newer lru. (Closes: #1071998)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 07 Aug 2024 09:53:49 +0300
+ 
+ 389-ds-base (3.0.2+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * patches: Refreshed.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Apr 2024 13:34:47 +0300
  
  389-ds-base (2.4.5+dfsg1-1) unstable; urgency=medium